From e12d6657ee6aa24b5111380b9249a8f012917806 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Apr 2006 02:48:43 +0000 Subject: [PATCH] Remove some unused variables. 2006-04-11 Matthias Clasen * gtk/gtktextview.c (selection_motion_event_handler): Remove some unused variables. * gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply a patch from David Trowbridge to improve the positioning of the search popup. (#338047) --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ gtk/gtktextview.c | 2 -- gtk/gtktreeview.c | 4 ++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93488b13ff..0a673b92be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-04-11 Matthias Clasen + + * gtk/gtktextview.c (selection_motion_event_handler): Remove + some unused variables. + + * gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply + a patch from David Trowbridge to improve the positioning of the + search popup. (#338047) + 2006-04-11 Emmanuele Bassi * gtk/gtkrecentmanager.c (gtk_recent_manager_init) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 93488b13ff..0a673b92be 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2006-04-11 Matthias Clasen + + * gtk/gtktextview.c (selection_motion_event_handler): Remove + some unused variables. + + * gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply + a patch from David Trowbridge to improve the positioning of the + search popup. (#338047) + 2006-04-11 Emmanuele Bassi * gtk/gtkrecentmanager.c (gtk_recent_manager_init) diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 43a2ec5df2..c8004f915c 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -5637,8 +5637,6 @@ selection_motion_event_handler (GtkTextView *text_view, } else { - gint x, y; - GdkModifierType state; GtkTextIter cursor, start, end; GtkTextIter orig_start, orig_end; GtkTextBuffer *buffer; diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 8708553ad9..22e80d3a6d 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -12766,14 +12766,14 @@ gtk_tree_view_search_position_func (GtkTreeView *tree_view, &tree_height); gtk_widget_size_request (search_dialog, &requisition); - if (tree_x + tree_width - requisition.width > gdk_screen_get_width (screen)) + if (tree_x + tree_width > gdk_screen_get_width (screen)) x = gdk_screen_get_width (screen) - requisition.width; else if (tree_x + tree_width - requisition.width < 0) x = 0; else x = tree_x + tree_width - requisition.width; - if (tree_y + tree_height > gdk_screen_get_height (screen)) + if (tree_y + tree_height + requisition.height > gdk_screen_get_height (screen)) y = gdk_screen_get_height (screen) - requisition.height; else if (tree_y + tree_height < 0) /* isn't really possible ... */ y = 0; -- 2.30.2